From 7a571545b5b6cba73c9d3791eafa0f030d94eb97 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <ok@src.gnome.org>
Date: Tue, 1 Jul 2008 21:05:41 +0000
Subject: [PATCH] applied patch from dmacks at netspace.org cleaning up some of
 the build

* extensions/Makefile.am: applied patch from dmacks at netspace.org
cleaning up some of the build system.

svn path=/trunk/; revision=346
---
 ChangeLog              |  5 +++++
 extensions/Makefile.am | 17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3b9fc0..466aa5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-01  Øyvind Kolås  <pippin@gimp.org>
+
+	* extensions/Makefile.am: applied patch from dmacks at netspace.org
+	cleaning up some of the build system.
+
 2008-06-28  Zhang Junbo  <zhangjb@svn.gnome.org>
 
 	* extensions/frequency.c: changed RrRiG... back to RrGrBrArRiGiBiAi.
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 2510a93..3a56830 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,11 +13,11 @@ EXTRA_DIST      = $(wildcard *.[ch])
 
 all-local: $(SOBJS)
 
-CFLAGS += \
-	-I $(top_builddir)		\
-	-I $(top_srcdir)		\
-	-I $(top_srcdir)/babl		\
-	-I $(top_srcdir)/extensions	\
+AM_CPPFLAGS = \
+	-I$(top_builddir)		\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/babl		\
+	-I$(top_srcdir)/extensions	\
 	-fPIC
 
 LDFLAGS += $(DYNAMICLIB)
@@ -29,7 +29,7 @@ LDADD    = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION)$(SHREXT) $(MAT
 endif
 
 %$(SHREXT): %.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
@@ -37,12 +37,13 @@ endif
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
 CIE-Lab$(SHREXT): CIE-Lab.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 sse-fixups$(SHREXT): sse-fixups.c
 	$(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 #lcms$(SHREXT): lcms.c
-#	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
+
+#	$(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################
 
 clean-local:
-- 
2.30.2